Code refactoring
TIMESHEET integration tests 1 and 2