Fixing via Theme Unit Test