This was originally part of change-id:Idef18f90b111a0d0c9546543d3347e551908fd78 but the rest of that patch has previously been incorporated into nextgen without these tests. Change-Id: I6ac491ed1cfc153e0ed3cb999c76feac9d5e74e3