several lint corrections on the tests, also found some minnor fixes todo