added test app support