Tests: Fix tests