Initial test restructure.