Finalised fixes for warnings in tests