Split up tests a bit, output subunit.