Remove test/unit stuff