Add store controller and tests