Added two tests for #533.