cleanup work from yesterday. Still experimenting with security structure.
cleanup of some tests
more test cleanup