Some util cleanup + explicit requires for tests