981770-66967252 Implement missing tests