some tests added / altered