Issue #164: More correcting of tests due to new entity methods.