Worked on some calculations and tests