no.action fixes + unit-tests