fixed some repetitiveness in test files