changed variable names, added couple methods to API, extended test