Corrected test 1 bugs