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