Code is now testable

Temporarily removed the template so that code could be tested