bump default timeout to 1 minute, + cleanup

* remove SHORT_TIMEOUT and LONG_TIMEOUT; only one thing used them any it
  can just use the default value instead
* unified BeforeEaches in suite; pull BeforeSuite out to make the order
  of execution clearer