Fix tests
Update public/