* Add setting to include transfer hours in calculations * Add some extra tests to check versions * A couple of more version test cases