Minor testmap changes