Augment test assistant tests

This PR adds more testing and some fixes for the test assistants