start to make resolver work with tags; scaffold tests