#1: AppPropertiesTest.class being refactored
#1: minor changes