Enhanced some comments to make more sense; added explicit test for newly added code part and shortened test duration by some 10ths of seconds; PEP8