Almost got another test suite running