Changed the strucutre of models from functions to callable classes. Add more tests
Merge branch 'master' of https://github.com/wallarelvo/keeper