fixed time and tests