Adjust existing tests to support the changes and add new tests to test the newly added feature. Signed-off-by: Joel Hirsbrunner <jhirsbrunner@baumer.com>