more tests and mods to classes