Added new test and modified existing test for timing issues