Merge into master

Updating some tests