Add calc utility & tests
add default controller tests