one step further: core problem solved, but test still broken.