Fixed some issues with the test app