Cleaned up unittests