renamed things in test app for consistancy