Updated unit tests
Updated cucumber features