Updated PropertyLoader and added a junit retry rule and test