Tests re-organized