following code styles on tests... not completed yet
several lint corrections on the tests, also found some minnor fixes todo