Removing unused models
Some refactoring and adding more tests