Add testcase for prev. commit. Minor fixes