FSUnit Changes

Migrating Unit tests to FsUnit