Merge with master and update tests