TimeTypes #167

- More tests
TimeTypes #167

- Cleaning