Fix test
Add test
Add test
Add test
Add test
Add test
Fix test
Refactoring method and test