Fix existing failing tests