Fixed couple of failing tests