Fix some bugs in testing wrt last checkin