fixing unit tests for obanyc-2033