This branch adds tests to confirm the solution to a potential security issue described in #1566 (closed).