Change files require order to fix failing tests on Travis