Fix stubbed tests