Sounds reasonable to keep tests separate. I'd forgotten the tests vary based on targets anyhow.