Remove same tests and trim some whitespace