Fixed tests, cr fixes