Fixed small resolve bug. Still 36 failing tests.