Re-factoring testing system to be class based