Some fixes to tests. Now destination path includes test name.