Don't explicitly include core.
Don't override the log fd
Add xephyr and xorg tests.