Minor cleanups
Add example fixtures