started fixing tests, went backwards for a bit. still 12 failing tests