renamed test files to mimic lib files