Removed spurious comments
Removed spurious comments
unittests functioning with new
architecture
Merge branch 'master' into dev

checking compatibility