Fixed tests and website