Remove and clean some test around useless helper method