Added time tests
Merge pull request #34 from brandc/develop

Added time tests