Added more tests to check for true-false and null-not null