Decrease timeout and remove 'end' test.