contains 62f246f from master. Add repeat and attribute interpolation tests