Fixed some obsolete tests in preparation for project restructure.