Clean up tests
Extract user formatting template helper
Remove generated contributors