get rid of private directory, test case patch-up