Added callable typehints, tests slightly fixed