Verbosifying all tests
Robusitified most tests