changed structure of store raw
added kwargs for tests and some pep 8