Enoguh tests
Change convenience method names