All tests are passing (though should be moved to new version).