Unittests are now running fine