First part of #2344067 is done.
Removed out-commented tests
Setting the expectations right with the _local field
Adding a todo