Added more tests around isEmpty/nonEmpty