Add some testing
Add more resolving infrastructure