Modifications to tests and ReadMe.