A little bit of cleanup
Added more tests no-empty