better organize the test app