More tests. Fix bug in empty.