Implements 3.3
Fix failing spec due to including wrong template.