Getting new tests working