Reverted unit tests, added tests for env and token variable functions