Start stripping out load functions from test module