reworked some of the time based tests