More self-tests