Add Test, Builder, Interface; Move Resolver to Core