Tests update
Templates made format agnostic