Removed java hack from tests