Add tests for manipulating the timeframe
Add more tagging, to improve test grouping
Stub out additional tests