Fix specs according to new requirements.