Additional tests and updated readme