fixup! Refactor tests