update User related tests
Added Calculator tests