Adding even more unittests