fixing tests
Merge branch 'master' of github.com:raphweiner/son_of_store_engine
design tweaks
resolved merge conflict