Uncommented all of the tests -- useless commit, sorry