Test Refactor, Doc Refactor, Other house keeping

@fluke777 please do not merge yet.

I want to discuss it.