unit tests unified
Dummy tests added for all the classes
Merge branch 'dev-mac'