Fixed too eager field/method fetch, add tests