Fixed project for dependencies
Unit tests now working
Merge branch 'master' into develop

* master:
  Renamed methods to be more accurate
  Cache deserialized objects