Fixs unit tests

100% correct