Still have issues with tests 2 and 4