add test; remove deprecated classes