Updated unittests