some improvements in test app