WIP: Fix specs