added/modified tests