Add tests and update String