Merged test to local.  Strange problems with disappearing scores on test.
More GMS code mappings