Store interface improved
Added unit tests