Added calculations test and fixed private constructor