minor changes
Moved test files from SM to a separate project