Modified autotest to use test/unit