Migrate more tests, classes, methods and logging away from Deploy V2