Our Tests passing, working on CR Tests