Fix model test app after merge