Stuff
Updated my part of the tests