Reset to java escape
Merge remote-tracking branch 'origin/feature/testing' into dev
Corrected some tests