Issue #191 and #192: Junits for EC2 and EC2Environment