Adjust and add some tests.