infrastructure review, more tests
fixed comment