Added comment model and simplifying testing