Figured out how to eliminate use of defines for template expansion
Moving methods into header
Moved all sorts to tests header
No need for methods.h