Refs #27: Clean up typehints for IDE
Refs #27: Clean up typehints for IDE; improve test coverage