RR: fix/mock tests and revert settings