Working testing implementation.

Changed some variable names