Adds additional tests in support of #16