ALM-204 small changes to layout and Aruba tests