pep8/flake8 cleanup
moved import to function to help with testing
started adding tests for calculator
added rest of calculator tests
tweaked logic to make it easier for me