Addresses issue #86

https://www.pivotaltracker.com/projects/280483#!/stories/40857085
https://www.pivotaltracker.com/projects/280483#!/stories/40857159

Both requested tests implemented.
Hope I understood idea behind those tests right, because steps in description were not clear.