Add unit tests, only fetch value if explicitly set