Add check if the handler exists.
Revert "Revert "Adds new test data""

This reverts commit 79d418e00a22c053393cb4536e457d6e36494202.
Adds test for the new items