Improve Application tests