further refined test suite