Remove warnings from tests
Some internal renaming