Update tests to load modules correctly