Fixed compile errors after merge and and then ran tests.