Adding in more unittests