added/adjusted tests