Add tests for 7b508ed08