Started with adding tests for the calculations