Made store location configurable, expanded and restructured tests.