Fix bugs in elaborator. Cleanup tests.

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>