Modify the tests to fit the changes. serialization tests in another pull request.
As requested by @teknico