#13 added tests