Fixed tests. Fixed problems with collection views and autolayout.
Merge pull request #123 from AshFurrow/help

@1aurabrown => Fixed problems with collection views and autolayout.