Added make test_server to example program.  Expanded test cases to find edge case bugs on re-scans and fixed accordingly