fixed undescore, updated tests