More tests, fixes :wrench: