Change sample application for unittest