Cleanup usage of shared examples