Minor cleanup/convenience changes to Types
Added extra time-formats for ceilometer
Completed port of tests