WIP Updated the tests.

Everything is running fine.