Got some re-factoring done with the Brag entity, tests working now.