additional test directory cleanup & test fix