Fix some insight violations + unit tests