Fixed tests and config