Renamed various tests.
Renamed two tests
Try to get a working dispose pattern.