TimeTypes #167

- More tests + cleaning