Tests updated for new testing framework