Small changes, starting tests.