LPS-35222 Updated test and Layout Prototype SMDHs

Hey Mike, I had to rollback the rebase from master because there was a Spring error with bean socialConfiguration