Simplify tests given the previous commit