
          Fixing caching problem in main, and adding unit tests

67f9e6f