test fixes and committing in a few tests where needed