Ok. I'll probably start looking more into the random failing tests instead of refactoring for now :)