Added remove func and test for GameMapper