Hotlinking working now
Some tests changed