Fix tests
Remove cc_by_sa template tags