Fix tests to work with new module header