Finishing #13. Problem with test spec for now.