Had to make small change to make all the test work!