Added some extra tests for the scheme; removed some incorrect tests.
Fixed up resolve tests.