jacket-17
Updated tests, added comments