fix that unit test and make it even better