fixed another handfull of tests