Fix some Apache tests