changes according to review: adds tests; details noqa's