Adjusted tests to new Time system