SLT-498 Test Fixing