Adds custom choice feature and tests it