Added findOne method, added tests