Cleaned up tests a little bit, did 5.6.2