MERGE COMPLETE. Fixed compile and test runs.