Fix specs
Code review