Added some new tests, and a WIP timer program