Removed const_cast from test. Updated some long-running test names.