ported over another test suite