add tests
fix merge conflict - keep both changes