Update tests for latest code