Pass in scope go get the correct data
Improve specs