Added time bounds on tests, to ensure completion and fail those tests that appear to block