Getting tests working on v1.9 stable