Updated require() ordering in src and test files