Add tests, updated readme