Re #1434 Adding tests.