removed not thrown exceptions, fixed typo
added calculator test