more test, fixes, and properties files Implementation