Fix major bug
Fix major bugs
Add tests
Add test