#9 - added tests