More changes to the test
Cleanup and docs
Fixed grouping tests