Fixing tests
Dynamic indexes are now prettified, too