simplify tests

original idea didn't work out because of the lack of generics...