Integrate jamie's test work