Refactor assets components for optimized both browser and test-suite