Fixed failing test by removing dependency on test run order