Refactor distribution tests to not be one huge file