Deleted empty strings and fixed a couple of tests.