Some more changes/tests.