fixed tests 1 - 3