Reorder code breaks when finding tests skipped due to --skip-rpl etc.
Add simple test that master_opt is non-empty