Added more option tests