Transaction and some tests fix
Merge branch 'validation' of https://github.com/meniam/model into validation