Fixed some test 2 left