Updating tests and adding properties files