fix for failing tests

This commit fixes the Failing Tests