In particular ExpectNoError needed testing, as it was unused so far and not functional in its initial implementation.