Added resolve test case for #1008
Cleanups