Cleans up create and create --test options