Tests #33, #36.

Tests fixing