Applying style to time frame tests template
Fixing merge conflicts