Update tests for support