Remove garbage; fix tests