One regression test still broken, but looks like it works