Code: Updated to latest master and fixed a test.