Removed out-commented tests
Setting the expectations right with the _local field