Tests - fixes