linting + fix DMR + more functional tests