Refactor tests
Can convert Modify[A] to ModifyAndGet[A]