Moar unittests
Changed test structure, fixed naming of files