First step - added tests