Re-organized tests