#1682: Added missing files (that were previously incorrectly referencing the old branch), added unit tests, recommitted lost changes.