Updated some of the tests. No more work but all are closer.
Merge remote-tracking branch 'origin/master'