store controller and tests - some pending