Exercise 05 - More spec fixes