fix tests and reflect improvements in readme