More hours model methods; split test cases into separate files