Updated tests.
Skip not completed test.