Fix Tests and Stuff