Added has methods, added unit tests