Making tests more abstract