981770-69929124 Implement neglected tests