review code, adjust test app.