Changed unit tests

Have to test a lot of more stuff