Final tests working