Unit tests passing. Removed testing templates to start adding real ones.