Fix Failing Tests