NaN fix
Log--
Mocks in own ns
Put ResizeFilter back in