Fixed tests and run