Remove deprecated methods; add test; small fixes