var: Adding more unit tests.