cleanup, spec tests