fixup! Refactor tests
fixup! Refactor tests