built answer and question factories and model tests
fixed merge conflicts