move more test functionality to common.js