rework for test app