981770-70685028 Implement neglected tests