Added comments
Updated tests & descriptions