Added not-empty?
Added more unit test examples