Specs are not broken.

However, there are two marked as 'TODO' which need fixed