Fix broken specs, add new specs