Fix pending specs, closes #14