Moved tests to integration.
Updated tests.