Fixed some tests and README