Started cleaning up unittests