Corrected FB instance names
STweeped the source Updated Library References Made the unit test compileable by disabling the tests since we have to start from scratch but maybe we can borrow from old tests
moved unit test to branch so it can be brought up to speed with the trunk library