Update tests
Add tests