Work towards getting tests working