More complete test suite