handle inline comments better. better test layout