radio: refactoring, tests