Updated Dao and Gateway Tests