new tests / bugfixes / added resolving of data as well