OC-2333: Complete Unit Tests