Unittests are now working