Add combined options test