added radius & diameter and updated enumtest