Refactors test to make it slightly more readable. Adds missing file