ec2 tests, move on_complete() to the end, now works thanks to proper handling of the "more" option