Test. Closes #1700