Application: fix manual and auto tests