Add static imports and extract constants for tests