#14 added tests