minor test organization edits