Changes to the test environment. First tests. Bug fix.