Remve Java directory. Contained some generated tests.
Added some scenarios
Fixed tests