Update generators and tests to use doubles/actual models