More shadow testing and dev.