Pythonicity increase and test update