second pass at test arranger