Updated tests and readme