added more test apps, and improve tests to cover all java versions