fixed some tests removed resolve tests for now...