Make test methods conform; remove lists in main dir