Removed unused function + updated tests to use the new template method.