no singleton, minor chnages, fixing tests

@cdmicacc please take a look