Changes to unit test file to include tests for variables