Working follow test (with fixed scoping bugs), coverage much higher

Change-Id: I2c0c4c8d2dcd834a27df6ccbc6b4d7337f5446eb