More tests, minor renaming, empty is fixed(?)

Just wanted to add one more interesting(?) test for tomorrow, and just
minor fixes.