Fixed query mode naming
Test updated