remove unnecessary return and pylint marker
add drain_consumer tests