Adding OER feature
Fixing unit test