Cleanup (and actually test) parts of adapters, move ReflectionHelper to lib