merge conflict
wrote a basic automated test for CRP