Cleanup, more tests.
Merge remote-tracking branch 'origin/master'