Clean up with angle units plus tests