Innocuous cleanup
Radix fix
Tests cleanup
Tests, tests, tests