Slightly un-break the tests

Still horribly broken. This is all the changes that Eclipse did for me