Reorganise test imports and gofmt
First pass at a timer implementation
More wip
WIP test approach