Adding tests for rad<->tb conversion
Merge branch 'develop' into pre-master