Fix spec tests for new api updates