Update / cleanup for test cases for version 2.8.