Revamped the unit tests and created a new class to test the custom variable definition tests