TimeTypes #167

- Tests + cleaning