Fixed tests.
Ticket #112