Updated as best as possible, a lot of tests still change the store
and never reset the state back which can cause some issues with other
tests.