tests
Some changes
Add tests