Updated tests and README