Fixed tests to account for changes in final keyword meaning.