add or empty, or not empty and more tests