Cleanup tests and supply simple fix.