Updated and separated tests.