Updating test namespace and directory structure to reflect framework changes.