Merge Maxim's good.cpp and add to regression test (#64)