Second pass at test organization