fixed 2 methods in change dao
changes in testing classes