Fixed problem with DBF deleted rows interacting badly with ScreenMap. 
Expanded and cleaned up unit tests.