Fixed tests
Fixed tests. REmvoed repeated case pattern