only 2 more failing tests to fix