Add tests for new behaviour