Fix tests
Add tests