Refactor testing harness again to accommodate weighted