Adding tests in preparation for #374