Refactored, moved things into AppContent and made the unit tests better
Add list content type to unit test