Tea Time Tests

This builds on top of #73, probably shouldn't be merged before that is.