Moved some startup code and variables to the @Before function