Remove option test mess