test and fix's