adding fixes for unit / functional tests that were broken with last push.