Fixed algorithm and added tests - added Helmet