Use correct include order in tests