Add tests to check the introduced behaviour