Improved performance again

Added Lookup for Unit Test to reduce data access.