Testing & Database fix