cr16: Fixes tests