Minor clean up
Port #472 test on master, close #473