Test. Closes #2140