Moving tests out of the app