Fixed time constraint tests to be more stable and now they pass