@bebef1987 is working on fixing this test separately to this pull (this pull is just some code tidy up!)