Updated application for deployment, covered with tests