Removing cruft from logic and template files.
Adding initial testing framework.