Moved AESTest.java and PropertiesTest.java to merlin/test package.

WindowState.java: Added missing catch statement for Exception.

Application.java: Made putPropDefaults() public.

PropertiesTest.java: Added test cases.