adjusted tests, now passing