Automate more tests