update tests and further minor changes on comments