Fixes several failing tests so that they now pass.