Removed a bit of repition in test files