Conparator tests are now included
Merge branch 'Singleton' into dev