Fixed Failing Tests