Get some tests working