Tidy up how populating simple with context and test works