Added store controller and test