remove some unnecessary <> and prepare diff tests