Merge "(y)etsin fixes, test refactoring, and misc fixes"