less verbose, more tests