Fixed some features of the test, still no passing, working on calculator