change attribute names to be more uniform, update tests