Restore test for multiple includes

This should restore the missing test noted in #485