Fixed failing tests and fixtures that were causing it.