Fix specs for full pass