fixed tests, added hour helper method, working on hrs class