Minor changes, mainly targetted towards tests.