updated unit tests, took unused variables out.