Add more coverage

https://www.pivotaltracker.com/story/show/43298641