Updated and working test app