Added tests 20..25 for Java