Added EndsWith and more unit tests