Fixing some tests that broke!