reorganise tests to allow more testing
start tests for time calculations