Moved Type Generation Test to correspond to Source Layout.