Update tests to work with the new split module