More tests and betterments! :rooster: