Further imporve unittests.