Add tests for where