reordered goals and updated tests