fix ami for tests; drop finishing waiting step; update  java_opts