Fixed a bug in 17.2
Added a False sample for 17.2 in unit testing