tweak tabbing and fix a test case