Fix tests and front-end stuff