Two new tests for #404