Fixed billable hours bug and added unit tests