fixed up unittests