Updated ignore file
Sorted out content formatter collection
Added tests