moved tests again; pylint suggested changes