Patch for test

This patches improve tests.
These are not necessary soon but would be needed when we bump core to later versions.
Ya, definitely. `TestUtils` would be created in `mock` package.