OEC-42 Improve test coverage