trying some more tests fixes