Added properties loading and unit test