Add some messy quick-checks, which found a bug. Correct that bug.
Move some code into helpers from TimeStore.hs
Test some more things