Added UnitTests / Added resolving of lists of components