Tests for OO version pass, rename and remove deprecated files
Change tests to use new file names