Started working on specs with general formatting tests
Resolved conflicts