Minor test updates for protected method refactor