Prepare for 5.1 release - Build fixes, normalized source and test-source directories.
Prepare for 5.1 release - Fixing test breakages after API changes