Add missing tests

Implements #1216.