Comment bugfix and more tests