Merged in 5 files for Roger
Removing extra version of Unittests