trying to fix tests... again
fixed merge conflicts
all tests passing
Merge branch 'test_fix_v_1000' of https://github.com/jmejia/daughter_of_store_engine
Merge branch 'master' of github.com:jmejia/daughter_of_store_engine