Refactor unit tests to verify the correct properties