Update tests, refactor radio