improve testing; remove duplicated files