Move high-relevance commercial component between 3rd and 4th containers

Also switch unit test over to Jasq