remove redundant tests and cleanup file