solved github issue #17 - Simplify: Add new scenario

Change-Id: I2e3baae7eb90778ff2b63ba37738351b1c57dce4
Signed-off-by: Marius <marius.oe@gmail.com>
Fixed unit test

Change-Id: I6cbec124c2e882d50211757ccac2dba165cad94c
Signed-off-by: Marius <marius.oe@gmail.com>
Merge pull request #74 from mariusoe/master

Fixed issue #17