ADCPT-B unit tests passing.  Still need to verify, but i think its right as is.