Really improved testing framework, work pretty well.