Add more generic tests, including some with incompatible args