Changes to Test Functions

Fixed TestVariables function to look better