Reorder tests, fix Honeypot-honeypot.