Finished implementing resolver and most of tests