Fixes some failiing tests