Fix undefined order errors in tests