Fixed tests so that they run-within stipulated time and do not fail the
test