fixed some tests, several TODO's; only 2 failing tests now