* Added comments
 * more tests