rm duplicated tests & code cleaning