added 40 ability and refactored tests a bit