Finally fixing our last failing test suite