Fix typo
Fix tests
Check save result
Add tests for remove method
Add more tests