Aded DRY to Test