fixed one big chunk of tests