Added comments and working on the tests