Still needs comments on the tests