Refactor - Change test order to avoid repetition in tests