Reintroduced the original return types of ToRenderable functions.
Fixed issues with pick functions in tests.