Started working on the tests. Calling it a night.