finish Application, modify relevant tests