Add some more tests :wrench: