Test fixes
Revert "Test fixes"

This reverts commit 34725943ab854dc2c2beddfb332e8f8ecf4d2451.
Revert "Fixed type hinting"

This reverts commit e34c73ceed26ba7842fa5e74481e48d7701b69da.