Update Main to begin re-addition of further tests