Modifying internal `alias` for readability.  Additions to some/all tests.