Major fixes for using self, and correctly calling test data in tests