Added support for nested outfit and other cases within outfit

Added test cases for the new features.