update tests for latest master