Ignore commented out entries, add additional test data (#1)