Add dummy comments for tests
Remove some copy&paste cruft