Made 9.2 and some tests