some more unittests and changes to files