Add tests corresponding to commit d1ef413