Merge "Rename tests dir to javatests"