Added test class to inherit from. Changed some variable names.
Added test class to inherit from. Changed some variable names.