added/updated tests