Fixed tests and updated README