Added further test cases. Fixed progress button where event might have been swallowed.