cleaning up some test and adding type hints