Fix tests

Tests fixed.