Small changes & tests.