adding tests for https://www.pivotaltracker.com/story/show/61242666