Expand testing

Testing is currently at a minimum.

Extend this...