Test update and bug fix