Some initial tests/changes.