Use local () instead of () in certain cases for performance
Fix tests for ui/css changes