make a bit of progress on adding tests