Updated tests, readme