Some testing updates

Includes the new Bridge class