Add tests for new behavior