Check in code clean up. This includes adding unit test for retrieving property file information.