Removes TODO marker
Adds some tests for create_store()
Adds more tests