Cleaning up and attempting 'literate' tests.