more tests and other misc changes; seem to have issues with multi-client file deletion