Created more unittests