More tests :wrench: