Archived some tests, patch some up so suite runs