Making tests simpler