Deployment tests

I see you addressed my comments about using a for loop above, this would be a good place for it as well.