EX test skeleton and a good couple changes