add more test scenarios basing on review feedback
add more test scenarios basing on review feedback

ooskapenaar/mojito,jeffblack360/mojito,jeffblack360/mojito,jeffblack360/mojito,yahoo/mojito,yahoo/mojito,1950195/mojito,1950195/mojito,ooskapenaar/mojito,ooskapenaar/mojito,jeffblack360/mojito,ooskapenaar/mojito,1950195/mojito,yahoo/mojito