Restoring the tests; changing some build configs in order to speed up our builds