Add further testing for the current (and expanded) system.
Add further testing for the current (and expanded) system.