Overhaul of tests required for API changes