Fixed one test to be really test (@Test annotation added to one test)
Idea of persisting everything as string implemented.
Merge remote-tracking branch 'origin/master' into ABRS-49

Before merging to master