A work-in-progress, proper rewrite of MT/Melody's test libraries