Added store controller and functional tests