renaming of tests and restructured oer test