readded tests.
clean up vars.