All seems to be working now, with all tests in place.