Tidied-up app_test_qei include files