Added comments and test