Fix route tests to account for loading and error substates