Extend tests, so we also check our abort buttons