The previous attempt to port the 'test' framework to the new framework wasn't super-successful. This does a better job, hopefully.
