Small changes to test code and app.js