Testing preparation

This adds some functionality for tomorrow's testing (Collaborators: Kevin and Pim).