#950 Fixed options tests