GR21 functional test updated